Make nix flake respect unused grammars #9326

loewenheim · 2024-01-12T23:19:47Z

17dd102 marked some grammars as "do not use", but the nix flake doesn't respect this setting. This is my attempt to rectify this situation.

the-mikedavis

Other than except, only is also possible and I think we should have grammars.nix respect it even if we don't currently use it in languages.toml: https://docs.helix-editor.com/languages.html#choosing-grammars

Here's where we do it in the source:

helix/helix-loader/src/grammar.rs

Lines 208 to 220 in 17dd102

    
           let grammars = match config.grammar_selection { 
        
               Some(GrammarSelection::Only { only: selections }) => config 
        
                   .grammar 
        
                   .into_iter() 
        
                   .filter(|grammar| selections.contains(&grammar.grammar_id)) 
        
                   .collect(), 
        
               Some(GrammarSelection::Except { except: rejections }) => config 
        
                   .grammar 
        
                   .into_iter() 
        
                   .filter(|grammar| !rejections.contains(&grammar.grammar_id)) 
        
                   .collect(), 
        
               None => config.grammar, 
        
           };

I believe if both only and except are defined then we prefer only (ignoring except).

loewenheim · 2024-01-13T15:17:01Z

Thanks for the heads-up, will refactor.

the-mikedavis

Thanks!

* Make nix flake respect unused grammars * Use default value * Refactor * Take use-grammars.only into account --------- Co-authored-by: Sebastian Zivota <[email protected]>

Sebastian Zivota added 3 commits January 13, 2024 00:15

Make nix flake respect unused grammars

f3a969f

Use default value

840e978

Refactor

8c2df9c

the-mikedavis linked an issue Jan 13, 2024 that may be closed by this pull request

Nix build error due to missing sources #9319

Closed

the-mikedavis reviewed Jan 13, 2024

View reviewed changes

the-mikedavis added C-enhancement Category: Improvements A-packaging Area: Packaging and bundling S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 13, 2024

Take use-grammars.only into account

64c34b0

the-mikedavis approved these changes Jan 14, 2024

View reviewed changes

the-mikedavis added S-waiting-on-review Status: Awaiting review from a maintainer. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 14, 2024

pascalkuthe approved these changes Jan 14, 2024

View reviewed changes

pascalkuthe merged commit a0b0210 into helix-editor:master Jan 14, 2024
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make nix flake respect unused grammars #9326

Make nix flake respect unused grammars #9326

loewenheim commented Jan 12, 2024 •

edited

Loading

the-mikedavis left a comment

loewenheim commented Jan 13, 2024

the-mikedavis left a comment

	let grammars = match config.grammar_selection {
	Some(GrammarSelection::Only { only: selections }) => config
	.grammar
	.into_iter()
	.filter(\|grammar\| selections.contains(&grammar.grammar_id))
	.collect(),
	Some(GrammarSelection::Except { except: rejections }) => config
	.grammar
	.into_iter()
	.filter(\|grammar\| !rejections.contains(&grammar.grammar_id))
	.collect(),
	None => config.grammar,
	};

Make nix flake respect unused grammars #9326

Make nix flake respect unused grammars #9326

Conversation

loewenheim commented Jan 12, 2024 • edited Loading

the-mikedavis left a comment

Choose a reason for hiding this comment

loewenheim commented Jan 13, 2024

the-mikedavis left a comment

Choose a reason for hiding this comment

loewenheim commented Jan 12, 2024 •

edited

Loading